projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d7c068 5c0f075)
Merge remote-tracking branch 'origin/master' into feature/android
authorPo Lu <luangruo@yahoo.com>
Sat, 29 Apr 2023 00:28:01 +0000 (08:28 +0800)
committerPo Lu <luangruo@yahoo.com>
Sat, 29 Apr 2023 00:28:01 +0000 (08:28 +0800)
1  2 
lisp/faces.el patch | diff1 | diff2 | blob | history
lisp/ls-lisp.el patch | diff1 | diff2 | blob | history
lisp/progmodes/cperl-mode.el patch | diff1 | diff2 | blob | history

diff --cc lisp/faces.el
Simple merge
diff --cc lisp/ls-lisp.el
Simple merge
diff --cc lisp/progmodes/cperl-mode.el
Simple merge
Unnamed repository; edit this file 'description' to name the repository.